NULL-statements caused by trailing commas are non-portable

Patch from Gary V. Vaughan

svn path=/trunk/; revision=401

diff --git a/ChangeLog b/ChangeLog
index b8d3840790d66291e0a0ada3377fb9c41f47d64d..318c32baf872f9d65eb0ab988fd0617d67ae9c59 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2009-03-25  Martin Nordholts  <martinn@svn.gnome.org>
+
+       Patch from Gary V. Vaughan. NULL-statements caused by trailing
+       commas are non-portable.
+
+       * babl/base/type-u16.c
+       * babl/base/type-u32.c
+       * babl/base/type-u8.c
+       * extensions/CIE-Lab.c
+
 2009-03-25  Martin Nordholts  <martinn@svn.gnome.org>
 
        Apply patch from Gary V. Vaughan that adds configure time checks

diff --git a/babl/base/type-u16.c b/babl/base/type-u16.c
index c09fe0f0f6df352ce8e57731cc00458f4b5dda46..9fcad8bfa708f3de71c9a426b5d3c574690cc4ab 100644 (file)
--- a/babl/base/type-u16.c
+++ b/babl/base/type-u16.c
@@ -108,7 +108,7 @@ convert_u16_double_scaled (double   min_val,
                                       src, dst, src_pitch, dst_pitch, n); \
   }
 
-MAKE_CONVERSIONS (u16, 0.0, 1.0, 0, UINT16_MAX);
+MAKE_CONVERSIONS (u16, 0.0, 1.0, 0, UINT16_MAX)
 
 void
 babl_base_type_u16 (void)

diff --git a/babl/base/type-u32.c b/babl/base/type-u32.c
index aa168d1fa07f70abfcd944e4e9c5d4267ec57054..fc38a019dd8d49c3f95262c5615de870216eddc5 100644 (file)
--- a/babl/base/type-u32.c
+++ b/babl/base/type-u32.c
@@ -107,7 +107,7 @@ convert_u32_double_scaled (double   min_val,
                                       src, dst, src_pitch, dst_pitch, n); \
   }
 
-MAKE_CONVERSIONS (u32, 0.0, 1.0, 0, UINT32_MAX);
+MAKE_CONVERSIONS (u32, 0.0, 1.0, 0, UINT32_MAX)
 
 void
 babl_base_type_u32 (void)

diff --git a/babl/base/type-u8.c b/babl/base/type-u8.c
index 66b64124b86f8da41ababbc81d7f5ab75971e266..9a67a0e3192edc97c2f40d2b61ad4d68fac86b20 100644 (file)
--- a/babl/base/type-u8.c
+++ b/babl/base/type-u8.c
@@ -108,9 +108,9 @@ convert_u8_double_scaled (double        min_val,
                                      src, dst, src_pitch, dst_pitch, n); \
   }
 
-MAKE_CONVERSIONS (u8, 0.0, 1.0, 0x00, UINT8_MAX);
-MAKE_CONVERSIONS (u8_luma, 0.0, 1.0, 16, 235);
-MAKE_CONVERSIONS (u8_chroma, 0.0, 1.0, 16, 240);
+MAKE_CONVERSIONS (u8, 0.0, 1.0, 0x00, UINT8_MAX)
+MAKE_CONVERSIONS (u8_luma, 0.0, 1.0, 16, 235)
+MAKE_CONVERSIONS (u8_chroma, 0.0, 1.0, 16, 240)
 
 void
 babl_base_type_u8 (void)

diff --git a/extensions/CIE-Lab.c b/extensions/CIE-Lab.c
index c4b4a52af3f810326ca0de4d4ea57070194220d4..855d71686b8c9c8d3136a2b3a92063b3ed835ea2 100644 (file)
--- a/extensions/CIE-Lab.c
+++ b/extensions/CIE-Lab.c
@@ -395,8 +395,8 @@ convert_u8_double_scaled (double        min_val,
 
 /* source ICC.1:2004-10 */
 
-MAKE_CONVERSIONS (u8_l, 0.0, 100.0, 0x00, 0xff);
-MAKE_CONVERSIONS (u8_ab, -128.0, 127.0, 0x00, 0xff);
+MAKE_CONVERSIONS (u8_l, 0.0, 100.0, 0x00, 0xff)
+MAKE_CONVERSIONS (u8_ab, -128.0, 127.0, 0x00, 0xff)
 
 #undef MAKE_CONVERSIONS
 
@@ -532,8 +532,8 @@ convert_u16_double_scaled (double         min_val,
                                       src, dst, src_pitch, dst_pitch, n); \
   }
 
-MAKE_CONVERSIONS (u16_l, 0.0, 100.0, 0x00, 0xffff);
-MAKE_CONVERSIONS (u16_ab, -128.0, 127.0, 0x00, 0xffff);
+MAKE_CONVERSIONS (u16_l, 0.0, 100.0, 0x00, 0xffff)
+MAKE_CONVERSIONS (u16_ab, -128.0, 127.0, 0x00, 0xffff)
 
 #undef MAKE_CONVERSIONS